From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 28 Aug 2013 10:12:23 +0000 (+0100)
Subject: build: Ensure that we provide CFLAGS and LIBS for Wayland builds
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3595
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3b158a96b7dbcc6161720755616738bb3bea152a;p=gnome-shell.git

build: Ensure that we provide CFLAGS and LIBS for Wayland builds

We need to use PKG_CHECK_MODULES, not PKG_CHECK_EXISTS. We make it
non-fatal by passing a final argument to the m4 macro.
---

diff --git a/configure.ac b/configure.ac
index 3cbcaf068..21a5136ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,15 +97,12 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
 
 PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
 PKG_CHECK_MODULES(MUTTER, libmutter >= $MUTTER_MIN_VERSION)
-
-AC_MSG_CHECKING([for wayland support])
-PKG_CHECK_EXISTS([libmutter-wayland >= $MUTTER_MIN_VERSION],
+PKG_CHECK_MODULES(MUTTER_WAYLAND, [libmutter-wayland >= $MUTTER_MIN_VERSION],
                  [MUTTER_WAYLAND_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter-wayland`
                   AC_SUBST(MUTTER_WAYLAND_TYPELIB_DIR)
                   have_mutter_wayland=yes],
                  [have_mutter_wayland=no])
 
-AC_MSG_RESULT($have_mutter_wayland)
 AM_CONDITIONAL(HAVE_MUTTER_WAYLAND, test $have_mutter_wayland != no)
 
 PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)